Fix breaking code from commit 905305cf
Merge remote-tracking branch 'upstream/master' into debianimage-update