Need to figure out what the fuck this did, and why removing it didn't break any tests...