revert r69777 since all the experts agree that extra import lines distract from the code
31 files changed