diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 8d79fbdbda8c..23266dfcbb7f 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2017-10-10  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r223130.
+        https://bugs.webkit.org/show_bug.cgi?id=178147
+
+        Breaks the build when EGLNativeWindowType is a pointer
+        (Requested by aperezdc on #webkit).
+
+        Reverted changeset:
+
+        "[WPE] Build failure due to invalid cast of
+        EGLNativeWindowType when targetting 64-bit ARM"
+        https://bugs.webkit.org/show_bug.cgi?id=178090
+        http://trac.webkit.org/changeset/223130
+
 2017-10-10  Sam Weinig  <sam@webkit.org>
 
         Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
diff --git a/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp b/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
index 5898e484c83a..cbe88dd5a873 100644
--- a/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
+++ b/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
@@ -75,8 +75,7 @@ void AcceleratedSurfaceWPE::finalize()
 uint64_t AcceleratedSurfaceWPE::window() const
 {
     ASSERT(m_backend);
-    static_assert(sizeof(EGLNativeWindowType) <= sizeof(uint64_t), "EGLNativeWindowType must not be longer than 64 bits.");
-    return static_cast<uint64_t>(wpe_renderer_backend_egl_target_get_native_window(m_backend));
+    return reinterpret_cast<uint64_t>(wpe_renderer_backend_egl_target_get_native_window(m_backend));
 }
 
 uint64_t AcceleratedSurfaceWPE::surfaceID() const