Revert "EPIC FAIL"

This reverts commit de1f083ad7fc5410c34a3046650a86293f9c7d0b.