VE-1478: Properly undo in teardown what's done in position