Revert "Apply DRY."

This reverts commit b6d40197a0134fdfe23764ab3637be8a73c8e945.