Partially revert 76e8ea835f1024beb52e2f260ddb4b5e12f05d1f

Apparently this doesn't work on Firefox 24. Sigh.