Applying patch in ticket #14273(http://core.trac.wordpress.org/ticket/14273)