MDL-42989 Admin: Work around plugin issues for end users