Trying to speed things up while we have this gaiatest / restart issue going on.