3f87ac3684
This reverts commit f9028a3be1.
This is giving weird heisenbug crash on only Windows release builds...
Reverting until we understand to issue.