Removed the circular dependency recovery code since it introduced additional complexity that led to obscure edge case bugs from occurring.