Revert "20130711"

This reverts commit 00222184b728567f65169b825865eb31f3b7b6ba.