Revert bff774a..cc81692

This rolls back to commit bff774a09467d5ac207422b3e9649c3de8f66982.