Attempt to allow build node flexibility