[3.8] Permalink controller cleanup