Revert "Revert "Browser to CM""

This reverts commit 93ab4e46591f99d2d247d73f32c17b46c91827b9.