Rollback move from address -> location

No idea what was going on there, potentially a change that only affects
certain events?