Disable this for now, it causes regressions and I'm not sure it's actually useful (nw)