Really sorry about this regression, @Saad_Haider. I have reverted that PR you reference and cherry-picked the commit so this goes out with the next engine patch (hopefully tomorrow):
Thanks so much for doing the initial investigation on this. That saved me a lot of time!