Revert "Trying to upgrade from Ubuntu maverick to natty (10.10 -> 11.04)"

This reverts commit b731427e3c3e1769bafd5f283cbd06507083d8d9.