undo PR 3085 in train-2013.03.29
Merge pull request #3162 from jrgm/issue3160-train-2013.03.29

undo PR 3085 in train-2013.03.29