Revert "Debug messages enhancement again"

This reverts commit ffc07e1be949ebdc34671692605aa35b0f06c3ca.