eliminate dependency on the half-baked code from the desktop version