Can you test upstream? 3.17 has a couple of fixes for UAS. If that doesn't work, I'll have to blacklist.