1.6 for 1.7 bis

Remove the commented section. It's confusing, especially due to nested comments.