Revert "20141117"

This reverts commit e3746bc799f4f6b5694ae8fba045a5815805f55c.