Revert "20141219"

This reverts commit a2d044736216139664aff9198b56aa4d8fcd2d47.