Revert "20141101"

This reverts commit 81a96cad5dd9726165da36b91d197d03987a6e9c.