Revert "20130925"

This reverts commit c303fbdd9a997e29bd2e8c3b95f27a87c3680950.