I don't think we can merge safely with this line uncommented.