Revert "Merge pull request #758 from mulesoft/MULE-7655"

This reverts commit 106c920ab77980444126076a89d6d52cdeed9bbc, reversing
changes made to abdfd27666f3e937b54867358c9ec7504e53a591.