Revert patch ofr218493