Tonic's picture
fixes circular import
6995e18