Revert "Fix some merge omissions for GPFS"