Merge "Revert "OWNERS files don't really work with groups yet.""