revert changeset b90d50c9d8be from bug 995407 because the wifi and cell tower data reporting code is not ready for a release audience r=mfinkle