Revert patch change and use patch logic try 2.