Revert "circular reference"

This reverts commit 8ba4e331b1a266ee9461c979fa07d4585a140c10.