Revert 7480333..29226ad

This rolls back to commit 74803333b915419350144236b4d95ec38687aba1.