Revert "Put this where it belongs"

This reverts commit ad6b0486557330c042cb032645126861a2170e30.