I can revert these changes then, I know there were a bunch of conflicts before the previous dev merged upstream, so probably a mistake.