Adding a patch to fix the above mentioned issue, also removing unwanted check...