Revert "Updates for CRS v3.0.0"

This reverts commit cee50a959ebe45891e5572ba5acb2142ffbbceda.