Fixes #1867346.