Revert "Merge branch 'hellybean_cm-11.0' into exp_cm-11.0"

This reverts commit 43d9bbbf6d57f20d68a89803d95dc21dd1b69baf, reversing
changes made to d4eab3b3bc07aa6c059d5d227ed9beab0cb24500.