Working around bug SI-6939