Revert PUP-8008 workaround
Since PUP-8008 is fixed in 4.10.9 and 5.3.3, this workaround is no longer needed.