Revert "From CM:"

This reverts commit a2c00d8fe4b2f3f12e2ca3d9af2778c919ea1cdc.