Revert "Temporary flicker workaround"

This reverts commit cab9476cd8ac950b705408e4b70eb67afb807a31.