Revert some parts to upstream Ubuntu Touch code.