Reverts #4556 due to flicker on Chome