attempting to adjust trailing whitespace to upstream
Revert "attempting to adjust trailing whitespace to upstream"

This reverts commit b979b05154774cdd108c40fd75eba5cbdc0f5bba.