Fix merge conflicts on #2228