Fixing CB-2955, breaking CB-2085, use localStorage, NOT WebSQL