Wow, ok. Good find.

Just to confirm the new test fails without this code in place? If so then feel free to merge both here and in the internal project that prompted this work.