Revert 6670088..0fa6fd5

This rolls back to commit 667008861ee048aff99a5e227eaeed8a537cac39.