A fix was checked in by Ezra after the 1.2 branch was cut, should be in
1.3 branch already.