Fixes a regression from 2bd1bbc4. Thanks Daniel Wiesmann for the report
and Tim Graham for the review.
Backport of c08f85fd from master.