Sloppy massive commit due to scattered versions