Revert b4994e9..709b165

This rolls back to commit b4994e96e8fc4153b24b26fa595e4290960ba49b.