Follow-up to aeed15eb8556ab671507f17ef9a8cf28903999aa