Backport default locations to 1-4-stable