Unbroke things

Rolled back bad changes I made.