Revert "20141229"

This reverts commit b63d764bfc161fe48f8899383404cb965425e0fe.