Follow-up from "Remove history from build trees"

The following discussion from !556 (merged) should be addressed: