Fixes a regression from 2bd1bbc4. Thanks Daniel Wiesmann for the report and Tim Graham for the review.
mentioned in commit e241444e