Reverted in 4.2 branch by commits: f36e0ef49ea74a298d2124eda190fb2e04d5cf51 4d22b54dd579d311c3462c2046ac052132c18ed8 e01d5b1c3a54b1bdb77e0cda10d7b005158dd023 0e02ca22c54e621d5084b7ac33061ae05a24347a