Backed out changeset d417487835cf

issue3979

--HG--
branch : 2.4
merge

--HG--
branch : 2.4