This reverts commit eef65ac776. This commit should not be in 4.3-forward and its already present in master
eef65ac776