Revert "20130920"

This reverts commit 1ced5f2a15bef9f4fd06887a3f66a7f90424309b.