Revert "V6.2 Debug issue changes"

This reverts commit d39ed917c417e36471dcd488506611b2448124d8.