Make no-ec2m work again.