Revert "Attempt to handle circular references"

This reverts commit 0b836ed573485eb1fe160f3d65a930c81fcd515f.

This should have went through code review.