Revert 74fa19b..6b2a3cb

This rolls back to commit 74fa19bc53cb12b36f11e2aec21e673c8ebcd72d.