Remove hacks + make scroll restoration more solid