Similarly for the other places where things have been commented out.