Revert "These are not necessary and impose a huge performance hit during scrolling"

This reverts commit 047cd75a864c31714d73391ea8013d90b14d40a3.