Removed old timing hack.