Workaround on #826.
Merge pull request #828 from emmanuel-keller/1.6

Workaround on #826.