Revert "20141217"

This reverts commit 6dde4366a4c613b065853e117767f7ccc002af4d.