Issue #2735841 by David_Rothstein: Avoid broken administrative links when the new core "administer fields" permission is added.