Revert "7-24 Commit1"

This reverts commit 22f61415784b9fbe4feed99d38fb4f303fe80be2.