Regression: reinstate terrible next_location method