Bring back workaround for the unwanted scroll-on-bufferswitch