revert orphan fix