Merge "Hopefully fix the sim-eng build, part 2."