Reverting function replacement

Apparently this is a VS only thing.