Update patch to not cleanup structure which got introduced in 3.6, ffixes build failure.