Revert "[import] http://bazaar.launchpad.net/~ubuntu-installer/ubiquity/trunk/revision/6210"

This reverts commit ef28067dc65156a1bad2436b4182b36b3b405412.
