Re-fix ACREP-30 in a way that works on production.