Meant to say as well, I don't think we should commit either my branch or another variant like your change until we have completely answered all the questions about regressions introduced by using gold.