Revert 37fab31..ae33775

This rolls back to commit 37fab31207408793221519762a47c1680c47b171.
lord, finally fixed everything I just broke.