Revert "Unbreak builds with CM package:"

This reverts commit 862a3ad392426ef464c7a8e132e8758f881bc318.

Framework counterparts added