Revert "More alpha hackery. This is starting to get embarrassing, really need to fix those tests."

This reverts commit 97a6921000a70f485499c850dd6d0eb915f1527d.