Revert "20130903"

This reverts commit 05757b9b80cf12770d448a08bd37a7b7dbfdcce8.