Sigh, remnants of the bad merge are still there