Revert "20130902"

This reverts commit 17941309424a5a5765e5ba1940fe04d57d3d1754.