Revert 1332f7e..788a8d9

This rolls back to commit 1332f7e58ad0976755017504ee97ecc8dc516990.