Revert "Fix build in cm tree"

This reverts commit fe7f6aad2210480eeb5d891365adf8607e1d4727.