Revert "blargh2"

This reverts commit 020eb2d385048acb786d1b75d0560cee9c364ddc.