Expanding or removing some '@@@@' marks. Copied from Perforce Change: 179574 ServerID: perforce.ravenbrook.com