This reverts part of a change causing regression with vmware import due to the
cdrom getting moved to SCSI while shifting controller IDs. (LP: #1970795)
(cherry picked from commit 3da8e81bf27f3770f3664a332d8767fa62fd4771)
Conflicts:
debian/changelog
Conflict solved by copying the debian/changelog entry from the archive.