Revert "Tested in simulator"

This reverts commit 2912dc47aa4d089bfd30b82b44cc063b2c89e933.