Layers are tools for design, as well as analysis. Collapsing layers requires very, very careful attention to the implications.
When you are dealling with a twenty year old protocol you are likely to find that the reason it is failing is that the original layering design was inappropriate for current uses.