Use code from production

This was the version running in production.
Probably locally patched.