MULE-7128: Rolling back big mistakes