I agree. 
But removing "buildername" is this PR makes thing complicated.  So I added "buildername" in order to keep thing "easy".
buildername must be removed in another PR.