Revert accidental merge of 087a727 to 899ae40 into Train 2013.03.01

Revert