This change addresses a number of issues with the support added by PR121985 which were exposed through more exhaustive testing, specifically places that needed updates to perform correct graph updates in the presence of cycles. A new test case is added that reproduces these issues, and the default is flipped back to enabling this handling.