Minor post-merge clean up

Somehow a ifdef'ed function was also declared outside the
ifdef. Use CM implementation keeping the function ifdef'ed,
as it is supposed to be