Manual fix of crappy merge attempt