Revert accidental merge of 087a727 to 899ae40 into train-2013.03.01