Revert "code 20140911"

This reverts commit 88be5c23d58fcc70c3ef5a9b1b39c50ce654bbbc.
Revert "Revert "code 20140911""

This reverts commit 31b87c53d604bceb7283393534d87188da76d770.