Revert "20141129"

This reverts commit 52c8cd811a938f5706caa3d0a73cbba187f7d1b6.