Moved the timing code to distribcommon