Oops. I've just opened PR #648 to remove these Location blocks.

Perhaps it's better to add these changes here?