Readded support for simulator builds