This reverts commit 397be0c9cc, reversing changes made to 18d412ab2f. Caused test failures in master branch.
397be0c9cc
18d412ab2f
__chkstk_ms