Undo an inadvertant revert from template changes so we still allow pythonic imports in module land.