Un-botch Kenneth's merge