This change would break them anyway (in a more subtle way)?