Revert "Many fixes to parent data handling"

This reverts commit dd6ef9b38bfaca1806c990576cf71f46a764efe5.