Revert "Revert "Revert "Revert "Revert """"cmdev"""""

This reverts commit 73b51c8674452166a092a28111cc202cc16ff3a7.