rolled back changes to make it run on Android, so we can test.