Revert "Fix more broken stuff."

This reverts commit 28c04f8b5b8434796e0bd9cf8e5b602781ae3061.