Revert e8440eb..c61c568

This rolls back to commit e8440eb08f1d1c25d0baae11b8fa44679b3bc5e4.