Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit c4307db1b8, reversing
changes made to 5472f952d4.

lib/queries.js

@@ -465,21 +465,15 @@ export function getEventMetrics(
   filters = {},
 ) {
   const params = [website_id, start_at, end_at];
-  const { url, event_type } = filters;
+  const { url } = filters;
 
   let urlFilter = '';
-  let eventTypeFilter = '';
 
   if (url) {
     urlFilter = `and url=$${params.length + 1}`;
     params.push(decodeURIComponent(url));
   }
 
-  if (event_type) {
-    eventTypeFilter = `and event_type=$${params.length + 1}`;
-    params.push(event_type);
-  }
-
   return rawQuery(
     `
     select
@@ -490,7 +484,6 @@ export function getEventMetrics(
     where website_id=$1
     and created_at between $2 and $3
     ${urlFilter}
-    ${eventTypeFilter}
     group by 1, 2
     order by 2
     `,