Fixed a regression introduced while solving merge conflicts.