Remove unnecessary/commented-out header inclusion.

Review feedback from Eric Christopher on r196140