Revert b30cb27..db051d2

This rolls back to commit b30cb27ef8eb6356a77f96ceb998d6d4b5386d98.