Revert r87946. The virtues of readability and of examples that

can be cut and pasted are more important than having a doctests
on examples that already work.