Revert 16 master

Trailing whitespace detected.