Unborking borkedness that came from merging of jamie's fixes
Merge remote-tracking branch 'github/hotfix/oem-168' into hotfix/oem-168