Revert debugging stuff that accidentally made into commit