Some recent changes left commented out.