Fixed (yet) another merge screw-up *sigh*