Reimplementing addition of 418s to location configs

It wasn't this change yesterday that caused the smoke tests to fail intermittently.