Revert "Simple fix for the flickering."

This reverts commit 5a7b246b7e0966d23974584ea83beee686137a96.
5.5.8