Hibernate to disk broken in edgy

After upgrading from dapper to edgy hibernate to disk stopped working. The computer appears to hibernate to disk, but when resuming it ignores the save images, replays the ext3 journal, and boots up. Swap is no longer activated - because it has a SWSUSP signature, and not a SWAP signature.

The solution I found is to:

1. Edit /etc/fstab and change the start of the swap line from UUID=xxxx to /dev/hdaX (where /dev/hdaX is your swap partition).
2. Re-create the swap partition with mkswap /dev/hdaX. Make sure /dev/hdaX is your swap partition as this command will erase the contents of that partition.
   
3. Edit /boot/grub/menu.lst and edit the # defoptions= comment to include resume=/dev/hdaX
4. Run update-grub to re-generate the grub menu file
5. Reboot
6. Confirm that swap is active
7. Hibernate to disk and resume as you used to

Update:
This is discussed in Ubuntu bug 66637 where the suggested fix is to set RESUME=UUID=yyyyy in /etc/initramfs-tools/conf.d/resume and run update-initramfs -u