Revert "DON'T add child operations as dependencies. It has different semantics and it causes dependency loops."

This reverts commit 3143394ae6bbf678b68d06d472af4fe25096ff01.
More robust dependency cycle solution