Ok, good to know. I'm going to go ahead and preserve the old behavior pre-2.12, which will make it so any uncertainty on that point will only affect 2.12 and up, making it so we can more safely just QA on prod