I will work on re-instating the previous patch in some fashion to fix this bug without regressing 1982218.
I will work on re-instating the previous patch in some fashion to fix this bug without regressing 1982218.