20140530 updata
Revert "20140530 updata"

This reverts commit 198b340599125bd823e45a7a1d60583ff3aa8c81.