MULE-7149 - rollback change in order to prevent affecting backward compatibility - this issues cannot be fixed in 3.x

(cherry picked from commit cf608b51fb90c0177d06219d96a5e2cabfe4e122)
(cherry picked from commit c57f31dc562576d1f5183a7155db6f87724702ad)