Blind attempt at fixing ay31015 problems (can't repro) (nw)