In mainline and R3.0 the change is not needed since the same change was done as part of commit for Bug #1477814
In mainline and R3.0 the change is not needed since the same change was done as part of commit for Bug #1477814