Revert "Fix a couple derps"

This reverts commit 58afd40abbb5df318f320e4cea2f59051d8a4f11.