Restore jcrowell's changes.