Revert ef9c356..c75179e

This rolls back to commit ef9c35658bcf9d6c833ec1cb023787e108ce94fb.