Fix mismerge from SVN r274427