Revert "Revert "Revert "Revert "20140119 commit2""""

This reverts commit 432c903a98fc93f02fad7f0e9b1e3af1c31a13d2.