Revert PR16467 change