Revert e041453..7a8348e

This rolls back to commit e041453462fc8020e76db6398163267c616fc40b.