Another merge screw up. Sigh.