revert CM 11 Theme related change