Revert "20130906-03"

This reverts commit 43e67f0cf0efc3081527241a4e8a4a6b5d1671c8.