Correct fix for gutter padding issue in #3211