Fixes bug 869033 - Made build_id a more picky field.

@peterbe r?