Update builder empty heuristic (bug 896741)