diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index 0cc0a1be05..a3f889424f 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -178,8 +178,7 @@ public:
         return ExtractValue(storage);
     }
 
-    // TODO: we may want to change this to explicit operator bool() if it's bug-free in VS2015
-    FORCE_INLINE bool ToBool() const {
+    constexpr explicit operator bool() const {
         return Value() != 0;
     }