Revert power patch sets with unexpected interactions