Revert "Improve android secure handling"

This reverts commit d4d107388c531c4b3bb7a57ec7771b233d9055c2.