Make UA mostly potatopatible (bug 888358)