Added logic to allow Android to work
Revert "Added logic to allow Android to work"

This reverts commit 02ba34d544be9b40f4385b790447a24569e50aa8.