Remove a deprecated variable substitution.
Merge remote-tracking branch 'origin/next'