In the interest of including this in tomorrow's cut of the release branch, I think it might be best to continue with the current implementation and refine it as we discussed in a follow-up PR. Is that okay with you?