Revert de1485e..d6cc290

This rolls back to commit de1485ef48e0a44d889a1754ad8ba172fa19e189.
no more moving between vectors