Revert "20130902"

This reverts commit 4edf157dc1614677ec7ef70fd21c8f229e52f8e2.