Back out latest changes for now.

This reverts commit 8bda22d9897096086feed062c2d6e972e5ad7f8e.