Since it doesn't really break anything else at the moment, let's go ahead with this. Could we please put a note in the code to revisit the problem?