Revert e05e1ef..9dba62c

This rolls back to commit e05e1efdcd842fef7882bf052dcca18fd481d0e5.