Do we plan to re-enable that for the time being? (until Jeff's finished server-side at least?)