Updating base turns out to be more complicated than I thought.

This reverts commit daa822aa.
This reverts commit c38428c7.
This reverts commit 4b73a8a0.