Revert "Timing hacks DO NOT MERGE"

This reverts commit 6d688b8bb051942cd3cdd5fc1e19f42c3049f8a1.

Change-Id: Ia4e1ebd0849f4c6b9958d7d78edcedd096042926
2 files changed