kevin pushed to apg (rawhide). "revert whitespace (..more)"