Revert all debug related changes now that we know why Travis was unhappy