diff --git a/.pick_status.json b/.pick_status.json
index cf454430999..3d852971935 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -894,7 +894,7 @@
         "description": "util: Fixed crash in HEVC encoding on 32-bit systems",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/util/vl_vlc.h b/src/util/vl_vlc.h
index d3a2a54deb6..a8a001bcfe1 100644
--- a/src/util/vl_vlc.h
+++ b/src/util/vl_vlc.h
@@ -346,14 +346,8 @@ vl_vlc_search_byte(struct vl_vlc *vlc, unsigned num_bits, uint8_t value)
 static inline void
 vl_vlc_removebits(struct vl_vlc *vlc, unsigned pos, unsigned num_bits)
 {
-#if defined(_MSC_VER)
-   /* MSVC Compiler defines unsigned long as 4 bytes so use explicit 64 bits mask */
    uint64_t lo = (vlc->buffer & (UINT64_MAX >> (pos + num_bits))) << num_bits;
    uint64_t hi = (vlc->buffer & (UINT64_MAX << (64 - pos)));
-#else
-   uint64_t lo = (vlc->buffer & (~0UL >> (pos + num_bits))) << num_bits;
-   uint64_t hi = (vlc->buffer & (~0UL << (64 - pos)));
-#endif
    vlc->buffer = lo | hi;
    vlc->invalid_bits += num_bits;
 }