Revert d74226a..c169c3b

This rolls back to commit d74226a810a32b3cfb325cac47e6579683a37d40.