Revert 9ed3d55..df3a3dd

This rolls back to commit 9ed3d5542f27ef5f2202bf4e44116b9bee535e7e.