This is a good change, and could be merged as is, but I would increase this even further to 2000, as suggested by ShaneSM in the bug.