Bug 847830 backout v1 train

Backout as per request by RyanVM