Revert 67ec158..65e45a1

This rolls back to commit 67ec158995d4982eac2bffa88848391432dea997.