Change the hook case per CR r95152