Revert 4900b84..4ec0e3d

This rolls back to commit 4900b841886b0711c86dd0cf415832285a763785.