Removed backported patch

Change-Id: I66bf546c0e734c03aa7db902d1400f3b912a1785