Revert d005c75..29eae5e

This rolls back to commit d005c753947615fcae192230e30b3343cfe20179.
continued dumbness