Fix my botched pull request merge.