Revert "Latency handling part 1"

This reverts commit 4a9743d82ea0c736a87aa1874235809405d7c75d.