upstream fixed this variable name in 0.3.16.15 and this backports the
fix to make diffs between cleanup branches smaller.