diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 237adcdbb25d..3216af812c06 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -1280,11 +1280,6 @@ DOMInterfaces = {
     'headerFile': 'WebGLTexture.h'
 },
 
-'WebGLTimerQueryEXT': {
-    'nativeType': 'mozilla::WebGLTimerQuery',
-    'headerFile': 'WebGLTimerQuery.h'
-},
-
 'WebGLTransformFeedback': {
     'nativeType': 'mozilla::WebGLTransformFeedback',
     'headerFile': 'WebGLTransformFeedback.h'
diff --git a/dom/webidl/WebGL2RenderingContext.webidl b/dom/webidl/WebGL2RenderingContext.webidl
index e8cc17133fc0..090595fe6b5a 100644
--- a/dom/webidl/WebGL2RenderingContext.webidl
+++ b/dom/webidl/WebGL2RenderingContext.webidl
@@ -10,10 +10,6 @@
 typedef long long GLint64;
 typedef unsigned long long GLuint64;
 
-[Pref="webgl.enable-webgl2"]
-interface WebGLQuery {
-};
-
 [Pref="webgl.enable-webgl2"]
 interface WebGLSampler {
 };
@@ -625,7 +621,7 @@ interface WebGL2RenderingContext : WebGLRenderingContext
     [WebGLHandlesContextLoss] GLboolean isQuery(WebGLQuery? query);
     void beginQuery(GLenum target, WebGLQuery? query);
     void endQuery(GLenum target);
-    WebGLQuery? getQuery(GLenum target, GLenum pname);
+    any getQuery(GLenum target, GLenum pname);
     any getQueryParameter(WebGLQuery? query, GLenum pname);
 
     /* Sampler Objects */
diff --git a/dom/webidl/WebGLRenderingContext.webidl b/dom/webidl/WebGLRenderingContext.webidl
index f9b91b24d4a9..a9855443d044 100644
--- a/dom/webidl/WebGLRenderingContext.webidl
+++ b/dom/webidl/WebGLRenderingContext.webidl
@@ -1004,7 +1004,7 @@ interface EXT_blend_minmax {
 };
 
 [NoInterfaceObject]
-interface WebGLTimerQueryEXT {
+interface WebGLQuery {
 };
 
 [NoInterfaceObject]
@@ -1017,12 +1017,12 @@ interface EXT_disjoint_timer_query {
     const GLenum TIMESTAMP_EXT = 0x8E28;
     const GLenum GPU_DISJOINT_EXT = 0x8FBB;
 
-    WebGLTimerQueryEXT? createQueryEXT();
-    void deleteQueryEXT(WebGLTimerQueryEXT? query);
-    [WebGLHandlesContextLoss] boolean isQueryEXT(WebGLTimerQueryEXT? query);
-    void beginQueryEXT(GLenum target, WebGLTimerQueryEXT? query);
+    WebGLQuery? createQueryEXT();
+    void deleteQueryEXT(WebGLQuery? query);
+    [WebGLHandlesContextLoss] boolean isQueryEXT(WebGLQuery? query);
+    void beginQueryEXT(GLenum target, WebGLQuery? query);
     void endQueryEXT(GLenum target);
-    void queryCounterEXT(WebGLTimerQueryEXT? query, GLenum target);
+    void queryCounterEXT(WebGLQuery? query, GLenum target);
     any getQueryEXT(GLenum target, GLenum pname);
-    any getQueryObjectEXT(WebGLTimerQueryEXT? query, GLenum pname);
+    any getQueryObjectEXT(WebGLQuery? query, GLenum pname);
 };