Whilst one cannot revert this for 4.13, I did remove the offending code, rebuilt and now one can boot without the kernel failure and the hdd is resized correctly.
Whilst one cannot revert this for 4.13, I did remove the offending code, rebuilt and now one can boot without the kernel failure and the hdd is resized correctly.