Revert 9081e24..c329caa

This rolls back to commit 9081e242a65425af793319a7aec2f720bce30721.