Fix compile-time error due to 23766f20