Revert "130430-2"

This reverts commit 306d5835d87dbf9e5aaf3c54164695b3f234f53b, reversing
changes made to d2e5c757113972cc11f274549e35b19b3233c134.
Revert "Revert "130430-2""

This reverts commit 1c1e0824d89eb13ee83596715af7750b56dd5f1a.