Remove patches of bug-1007520 due to patches have been landed