Missed in 2078 merge
build env cleanup