Revert "update 2609 1627"

This reverts commit c4502d9f52f2627d7248f8b4522e511848b27f58.