Revert "20141108 update 1"

This reverts commit b3f9a86325875249087fc8271b060a7eb3db245c.