revert a whole lot of debugging stuff