Revert "cwm620"

This reverts commit 87f8be79393a44ae00b8a95c86993c2a525740ce.