Revert patch change and use patch logic.