Work around some path issues to let sudo work on 2.2. Will likely need a better long-term solution. Ticket #3994