deb: Revert some pieces of cm-10.2 bringup