Bring back behavior pre #4004.
Merge pull request #4105 from ktf/cleanup-4004

Cleanup #4004.