Revert 1ec1b11..ef1112b

This rolls back to commit 1ec1b11c06c798909874e14f0bfa46435e7e9801.