Temporarily removed CAF changes