... in document"

This reverts commit 2903d85d.

It was a good idea, but is not complete.

Change-Id: Ia0da2640889ce6e78b89b27c75fae9d6508afd40