Revert r113610, it appears it's impossible to fix vector in a sane way. If we try...