second pass to get the REGEXPECTs back to 'normal' state