Revert "Patch to 3.4.86"

This reverts commit 19ca5183099e7b22b4f42ce372d018a7525f095b.

Change-Id: Ic09960722be5fcb4edf6988f4e9d0a3aaa3f2306