Revert "Remove some things."

This reverts commit 06f20364b4a3f22ced973f1c9220bdb0f1c17abe.