Partial workaround for PR#2771.