Revert "Trim things down a bit"

This reverts commit 01f20b2e688cf7738db1ec5cc1d9ce07f441fc14.