Fix an odd merge fault that I'm not sure when/how it happened.