Revert "cm 8226-commom"

This reverts commit 0ca03f75988cac49c05b0fd5dac609edb6f664a1.