Workaround for PR1508.