Fix Dialer not building, and switch to CMs Dialer (well, kinda)