725b10e3ae
This reverts commit 2a2ef15caf791f30c471526c1b74e68803f0c405 as smart-apply-patch script didn't pick the latest patch.