Strengthen 27041.
Trying to speed things up while we have this gaiatest / restart issue going on.
Correction to last commit.
Merge pull request #215 from roydude/v1-train

v1train