undid fuck ups

This reverts commit 15a8296def662d25100235cc77bb2891ddb1185b.