revert/cherry-pick: handle single quote in author name.