This part probably SHOULD use RFC-speak, even though it didn't previously.