Conditionally Revert "put back the unused virtuals in Vector<>"

cherrypick