Revert "Minor cleanup."

This reverts commit 5234e414519f713d6b55ca89b4df91389ad0695d.