Revert "Massive merge, part 2."

This reverts commit 1e4e422b693cf2820027cb2a159d269be33cc0e4.