Revert "Disable CM overlay for now"

This reverts commit 049b3d32e48b4c38e73c6dcee4f0fddc89dcabf0.