Packager: Back out all 10.04 related changes

Giving up on packaging for 10.04, but the unrelated fixes in this branch
are still good to have.