Fix circular dependency when importing helper.
Merge pull request #837 from johngian/fix-circular-dependency

Fix circular dependency when importing helper.