Revert "this is getting ridiculous"

This reverts commit d8d844fc502c82bbdda3bf97501424f083b96eda.