Revert "Fixed timing stuff on master. Added thread-safe option to perf."

This reverts commit 664bf9e913fc90722f3b7a7c4e89633840ba30c5.