Undoing some optimizations in ModifyRP functions