Trying to revert this commit was not straightforward because it interfered with other commits. I tracked down the original submission and reverted all of them https://<email address hidden>/
Branch with the reverts on top of master-next: https://code.launchpad.net/~roxanan/ubuntu/+source/linux/+git/mantic/+ref/cranky/master-next-reverts/
@Ivan tested it and confirmed the machine now boots properly.
Trying to revert this commit was not straightforward because it interfered with other commits. I tracked down the original submission and reverted all of them https://<email address hidden>/
Branch with the reverts on top of master-next: https:/ /code.launchpad .net/~roxanan/ ubuntu/ +source/ linux/+ git/mantic/ +ref/cranky/ master- next-reverts/
@Ivan tested it and confirmed the machine now boots properly.