Iron out manual changes that were made directly on the production branch

[sdelafond]

This should bring things back to normal, and enable Arnaud to automatically merge pprod into production when he needs to.