Revert "Revert "Cheng 3/9/13""

This reverts commit 7f61490c4a5dfa19706a7d1945d20763efca90ec.