Revert "Added macro to allow switch to thread cpu time"

This reverts commit 1f0d437291e913c5bbe694dd4315ec26400b2864.
osx fix