Revert "Fix timing bug"

This reverts commit 668df9ccb66e7676ebbe827ce22c4b3aaf8a8761.