Synchronized change to support removal of retain cycle from parent repo.
  - change from previous commit to resolve this issue had a bug.