Revert "Try more crap"

This reverts commit e2cfac6cf77e6b8c81fd680a830f38f99d51e80c.