Revert 17c6b3f..6117fd0

This rolls back to commit 17c6b3f87e0f8feddfecc01cb7e65e6ca6de2e2d.