Enable bug workaround also for MSVC 2017.4