Handle latest trunk. Make the workaround an option. (new release 3.73)