This PR fixes an issue shown up by the linter caused by merging PRs #1470 and #1483 without rebasing.