diff --git a/lib/cartodb/backends/dataview.js b/lib/cartodb/backends/dataview.js
index 4eebb2a2..4a79612f 100644
--- a/lib/cartodb/backends/dataview.js
+++ b/lib/cartodb/backends/dataview.js
@@ -21,51 +21,52 @@ function DataviewBackend(analysisBackend) {
 module.exports = DataviewBackend;
 
 DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, params, callback) {
+    const dataviewName = params.dataviewName;
 
-    var dataviewName = params.dataviewName;
-    step(
-        function getMapConfig() {
-            mapConfigProvider.getMapConfig(this);
-        },
-        function runDataviewQuery(err, mapConfig) {
-            assert.ifError(err);
+    mapConfigProvider.getMapConfig(function (err, mapConfig) {
+        if (err) {
+            return callback(err);
+        }
 
-            var dataviewDefinition = getDataviewDefinition(mapConfig.obj(), dataviewName);
-            if (!dataviewDefinition) {
-                throw new Error("Dataview '" + dataviewName + "' does not exists");
-            }
+        var dataviewDefinition = getDataviewDefinition(mapConfig.obj(), dataviewName);
+        if (!dataviewDefinition) {
+            throw new Error("Dataview '" + dataviewName + "' does not exists");
+        }
 
-            var ownFilter = +params.own_filter;
-            var noFilters = +params.no_filters;
-            if (Number.isFinite(ownFilter) && Number.isFinite(noFilters)) {
-                err = new Error();
-                err.message = 'Both own_filter and no_filters cannot be sent in the same request';
-                err.type = 'dataview';
-                err.http_status = 400;
+        var ownFilter = +params.own_filter;
+        var noFilters = +params.no_filters;
+        if (Number.isFinite(ownFilter) && Number.isFinite(noFilters)) {
+            err = new Error();
+            err.message = 'Both own_filter and no_filters cannot be sent in the same request';
+            err.type = 'dataview';
+            err.http_status = 400;
+            return callback(err);
+        }
+
+        var pg = new PSQL(dbParamsFromReqParams(params));
+
+        var query = getDataviewQuery(dataviewDefinition, ownFilter, noFilters);
+        if (params.bbox) {
+            var bboxFilter = new BBoxFilter({column: 'the_geom_webmercator', srid: 3857}, {bbox: params.bbox});
+            query = bboxFilter.sql(query);
+        }
+
+        var queryRewriteData = getQueryRewriteData(mapConfig, dataviewDefinition, params);
+
+        var dataviewFactory = DataviewFactoryWithOverviews.getFactory(
+            overviewsQueryRewriter, queryRewriteData, { bbox: params.bbox }
+        );
+
+        var dataview = dataviewFactory.getDataview(query, dataviewDefinition);
+
+        dataview.getResult(pg, getOverrideParams(params, !!ownFilter), function (err, dataview) {
+            if (err) {
                 return callback(err);
             }
 
-            var pg = new PSQL(dbParamsFromReqParams(params));
-
-            var query = getDataviewQuery(dataviewDefinition, ownFilter, noFilters);
-            if (params.bbox) {
-                var bboxFilter = new BBoxFilter({column: 'the_geom_webmercator', srid: 3857}, {bbox: params.bbox});
-                query = bboxFilter.sql(query);
-            }
-
-            var queryRewriteData = getQueryRewriteData(mapConfig, dataviewDefinition, params);
-
-            var dataviewFactory = DataviewFactoryWithOverviews.getFactory(
-                overviewsQueryRewriter, queryRewriteData, { bbox: params.bbox }
-            );
-
-            var dataview = dataviewFactory.getDataview(query, dataviewDefinition);
-            dataview.getResult(pg, getOverrideParams(params, !!ownFilter), this);
-        },
-        function returnCallback(err, result) {
-            return callback(err, result);
-        }
-    );
+            return callback(null, dataview);
+        });
+    });
 };
 
 function getDataviewQuery(dataviewDefinition, ownFilter, noFilters) {