Revert "REVERT THIS. WAY TOO MUCH LAG"

This reverts commit fd92cf7b10f8cc41189720c8aa8b104e87d9d284.