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