Revert "revert part of 835d3f6 in commented lines"

This reverts commit 0e07be25e2cd3166329eb1f46015f6921488f342.