axeing trailing whitespace
(cherry picked from commit cda4612a00a778cd205e6990df73ba2454df6151)