Fix inadvertent mis-merge