I reverted this fix as it causes unit test breakage and we are releasing 4.1.22 today, will rework for next release.
I reverted this fix as it causes unit test breakage and we are releasing 4.1.22 today, will rework for next release.