Partial revert of fefe00c7a5added55fcea0bd7622584cda266e71

- Keep lastBuild for result color