Revert "20130809"

This reverts commit 52c8966c5c683729ce8923cceb77ac2a57493fe5.