Removed patch style because the issue has been correctly fixed in rcommon block