Cleanup merge

Fixes last merge issue with #2203. Sorry, I'm being impatient.