This was reverted in 4.2 branch by commits: b3b43a82bb2388ff6c4f9679823efeeb3342a908, f1f5c1ae3a8128cb406906d5f6bce01ff5088b16