Merge "Fixing crash where we were assuming an old parent hierarchy."