Reverting 77eb3d4e8bcc44bc3 since it seems to be causing issues while scrolling