Revert "Bug 5630 CAS improvements"