Merge "Revert "Push mapping from file extension to GID.""