Bottom line, anyone building / testing this code post-land on master has to be able to do it without all this