the PR you reference, makes those removals return ...
# core
t
the PR you reference, makes those removals return
-1