Revert "Fail android"

This reverts commit 2a9eac6738df1f7f8699e5cda74efdb0c1813b70.
Revert "Fail"

This reverts commit 59b78057f66921426e58c7a1b20469636fb292e7.