Revert "broke it"

This reverts commit 41dfdfb71135d18ad1679e96c2ef34885e874434.
upperclass W's