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

This reverts commit dd23805c79491f281317fa7e49f08b1bff9ed480, reversing
changes made to 2b55da6127d4a6cc0791c45990f0f7d555a16e4d.