Revert "Ensuring post rollback persist only saves pauments where the state is invalid"

This reverts commit 8b533872745b1648b850805b38cac41f0c5cb344.