Revert beafae7..d889134

This rolls back to commit beafae7976bec04d65bffce01c1769faba035284.