Code cleanup.
Revert "Code cleanup."

This reverts commit 7eac137011a36cb6b560a5ad3ca03f3bb464aeef.
Code cleanup.