Workaround for SI-5397