diff --git a/src/outputtype.cpp b/src/outputtype.cpp
index 85119ef6c2..9a3870d8dc 100644
--- a/src/outputtype.cpp
+++ b/src/outputtype.cpp
@@ -73,7 +73,6 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key)
 {
     PKHash keyid(key);
     CTxDestination p2pkh{keyid};
-    /*
     if (key.IsCompressed()) {
         CTxDestination segwit = WitnessV0KeyHash(keyid);
         CTxDestination p2sh = ScriptHash(GetScriptForDestination(segwit));
@@ -81,10 +80,6 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key)
     } else {
         return Vector(std::move(p2pkh));
     }
-    */
-
-    // Blackcoin: only P2PKH is supported for now
-    return Vector(std::move(p2pkh));
 }
 
 CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, const CScript& script, OutputType type)
diff --git a/src/test/fuzz/key.cpp b/src/test/fuzz/key.cpp
index 7489297130..ea6883c08d 100644
--- a/src/test/fuzz/key.cpp
+++ b/src/test/fuzz/key.cpp
@@ -107,12 +107,7 @@ FUZZ_TARGET_INIT(key, initialize_key)
         assert(pubkey.IsValid());
         assert(pubkey.IsFullyValid());
         assert(HexToPubKey(HexStr(pubkey)) == pubkey);
-        /*
         assert(GetAllDestinationsForKey(pubkey).size() == 3);
-        */
-
-        // Blackcoin: only P2PKH is supported for now
-        assert(GetAllDestinationsForKey(pubkey).size() == 1);
     }
 
     {