Revert 0899507..f622064

This rolls back to commit 0899507dae14279cd543faf49385f9753b5f98e3.