Revert to commit with working simulator