Revert "Core: Re-holoing whitened changes to follow google."

This reverts commit d9e32c22eefbcdab24543dec7119f6c9d17c9aa9.