Revert The Merge changes to fix Windows build

[leszko]

No description provided.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 34.74499%. Comparing base (b87c7c3) to head (3c74cfb).

Additional details and impacted files

@@                 Coverage Diff                 @@
##              master       #3247         +/-   ##
===================================================
- Coverage   34.74775%   34.74499%   -0.00276%     
===================================================
  Files            136         136                 
  Lines          36175       36175                 
===================================================
- Hits           12570       12569          -1     
- Misses         22893       22894          +1     
  Partials         712         712                 

see 1 file with indirect coverage changes

---

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b87c7c3...3c74cfb. Read the comment docs.

see 1 file with indirect coverage changes