Revert "I broke something again"

This reverts commit 072590e19b066122efc101b7d452fe28559feb40.