Unbreak the build and diff-reduce