Revert "Merge cm-10.2"

This reverts commit b1a87109d848a672f324e7c22eb9a98aa822f2d4.