Revert "Simple fix for the flickering."

This reverts commit 7df225c81f8ecc25ac0b96e8f0b5892500c0435a.