20141211 update

20141211 update
Revert "20141211 update"

This reverts commit 819b9df00321822536a374f5aab96436c78139c9.