Revert "Don't repeat yourself"

This reverts commit 38c67ecb937e6ec8ab341b7b895fdd01de5907c0.