Revert "fixed circular import"

This reverts commit fd57e018f53711db346ef33ccd94bcd80ed3133a.