19421 no longer blocked.
Removed unnecessary check in 19421.
Merge pull request #7 from roydude/v1-train

V1 train