Revert "CommitOne"

This reverts commit 765638c9b01554855b62e9944ebcea1b75d7bf35.