Revert to crdroid