Revert "Update patches for 930504 and 961365"

This reverts commit dff6b59ca5d229a3627b95137493e17dabfb0968.

961365 is crashing on Windows.
(930504 will hopefully be merged soon).