Revert "Return fixes v2"

This reverts commit f64d2262f69e58eb16079b7a34da6f6f4fed4071.
Return fixes v3

RIP Github for Windows