Should work

Looked at the files that have been changed. Commented and uncommented
parts are the same.