Revert attempted android fix