Workaround for SI-8091