For once and for all, fix the changes needed for production.