Bye bye workspace.xml (part 2)