CDB-2920 Reverting cartodbfication