I reverted the commit and I also fixed the bug with Lightsmark. So far everything seems to work. Maybe it's time to enable HyperZ by default?