Revert "no location yet (subject to revert)"

This reverts commit c4d61c86a42f2d9b24add5de09a77f484b1256de.