whoops did this in enterprise. imported thing to fix sconscript
equivalent
okay, stuff from enterprise, hopefully I didn't miss too much
okay, hopefully this tree works and has all the changes I should have done here, but did in enterprise