Revert 67813ba..5625662

This rolls back to commit 67813bab94731c028959afbb41a97983c55a6dff.