Emergency fix of failed merge 'wat'