Undoing a lot of commenting out.