Revert "more portable"

This reverts commit 905486dc864fb85a5fa2e199e0603fb26c4ce42c.