Revert "back to CM Gallery2"

This reverts commit fa08523073b3722e3372c34bc4dae586c256e861.