Merge change 3222

* changes:
  Unbreak sim build.