Revert "Merge Upstream"

This reverts commit 1638e03a7a0d85bb9afd7cdad6b77e32fde3fe12, reversing
changes made to 6c36daa0e998846604a13431a6b46258bf85b734.
Revert "Revert Whitespace Changes"

This reverts commit 6c36daa0e998846604a13431a6b46258bf85b734.
Revert