yep, I think this is fine to land this code now (esp to fix 1.3) and we can revisit on master later.