Revert "20130807_1057"

This reverts commit ea023376fdceea87c0cd9b20785fdcaf20f0ad52.