Undo old vs-cleanup
Merge topic 'vs-cleanup-undo' into next

eb9de54 Undo old vs-cleanup