Fix unintended problems from unintended merge