See my comment on #586