remove RFC4985 reference for now
Checkpointed: