Revert "Merge pull request #10387 from rexboy7/fix-bug840147-bug877903-v1train"

This reverts commit d55d2d2d2317b09cc61404ec6d23c0346e9e006b, reversing
changes made to 9c9f1445afadcfd7078311341d35800f696fc90d.