Revert "Switch keystore to binder"