We need the unmodified r4 for get_potential_new_heir. This partially reverts commit 8d785f72d9.
8d785f72d9