Bring back code lost in a merge