CP-4: Reverted whitespace changes.