Revert e32be2a..84731f0

This rolls back to commit e32be2a6247e1859e4c7c506911b3d43b8c59855.