PRs should be atomic, if they need to be separated for reverting, they should be multiple PRs.