Fix to build. Remove cross platform calls. re #9394