Revert "Get rid of some duplication."

This reverts commit 23329828bfd64925dca25655d210a8e05b388234.