Revert "Revert "Put this where it belongs""

This reverts commit 7746e3172665d5d5f6a3d350c25e5d8347ede693.