I've cherry-picked that change in eba689a. Thanks!