Merge "should fix sim build, hopefully" into gingerbread