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

This reverts commit a25ee1785227ae35c671e3b728b7ac0196dbf62a, reversing
changes made to 064e52774a36c757aa06a953ccde4fcc254b3817.