Reverting "For camap v1.8"
Revert "For camap v1.8"

This reverts commit 7d83ccc499c9129c3f876cc327d762e96e704481.