#726 - Reverts an earlier revert. CLA signed.

This reverts commit d474694c32c0169c4247abb7f31874da1b211ed6.
#726 - Reverts an earlier revert. CLA signed.

This reverts commit 16166760841011e819c667f58bb9e79fe8430c89.
#726 - Remove trailing whitespace.