Revert "Version without location"

This reverts commit 0b4d95b1a8e71bee618b9ef2c67ad404d6cb2328.