Attempt to fix the MSVC build by working around a layering issue