Revert "20130807_1053"

This reverts commit e5176cd3ed1414cbe52d47d32895a21f5c99cb65.