cross platform bug fix
Revert "cross platform bug fix"

This reverts commit 644a40d32ddefc5b849efcad8670fbcba565ab23.