DEP update

First attempt at restoring already created locations rather than
recreating the locations from scratch.