CVE-2013-4496:Revert remainder of ce895609b04380bfc41e4f8fddc84bd2f9324340