Revert "cm-12.0: Use CM's D801 (cm-11.0)"

This reverts commit ddc7ba531d5426b0a66bdb31d0ccd789f28541ee.