Remove special handling of Location. Closes #1926