Fix an off-by-one bug in the un-vbarring logic.
This is a regression introduced by recent refactoring.
Authored by: david_costanzo 2020-07-12
Parent: [r5351]
Child: [r5353]
