Revert "Prune a little cruft."

This reverts commit af7889169da3cb2c99f56a54e02fdf12597e5442.