Merge change 4662

* changes:
  Truly fix the build (I hope).