Workaround for bug #DIFFEO-586.