The original bug hasn't been fixed; its impact was expanded when we started using g-p-m for normal shutdown and reboot. Sebastien's change has reverted to the old behaviour, so this bug once again only affects shutdowns triggered by g-p-m. -- Shutdown from g-p-m doesn't use uspash https://launchpad.net/bugs/35182