revert CM and PA changes