Revert "Debug Keystore"

This reverts commit 4c30a5043ac52a53db4fe24517c3706d535bd379.