Minor revert because of CMR API change.
Tabs to spaces.