[noticket] Mending merge woes #2