Remove the hack for bug 677221 which was fixed awhile ago.