Fix broken simulator build in master. Please patch next branch, too.