Revert "I hope this isn't doing what I think it is"

This reverts commit f365a65476e1980819c419151619bd45ea978075.