This is the only part of this PR I'm not convinced on. @jurisgalang if you want to own then consequences of this change, then we can merge as-is.