Revert "attempt 2: uncommenting stuff i just commented out"

This reverts commit dc4b4fb90925bf17ed2bf43c783738b7df8ccd1c.