Meant to post my response as a comment rather than an answer. I'd delete this if I could figure out how to do it.

Thank you so much for this. This change has really broken my app, and I was having no luck at all figuring out how to address it. I will give this a shot.