Historic commit for v2.10: Fixes per forum post http://userscripts.org/topics/113425.