Revert fix for #1489058 because it opened another IE8 focus issue