remove patch, now merged in upstream

Change-Id: I3b602788a7f5212fe408f9ac989abdb05738be39