Sorry about being so quick to merge. I will fix this on the 2.1 PR, and cherry pick it forward.