reversing some weird hacky thing I did in the last commit