Revert "well, this can't possibly get any worse."

This reverts commit e287d242273dc6b6e907d009c39548a7a8d8d83c.