Revert "Merge tag 'v3.0.9' into cm-10.1"

This reverts commit 568f4f5b3c363e9899fd3bc5cd1c75e112f52d7f, reversing
changes made to 95f34677aae19f725421ba4140ad0dd92d1d1065.