This change is fine, and probably what I should have done originally anyway. I made the mistake of thinking that since it worked on an UltraStor it would be fine. Sigh. Anyway, I'm not currently in a position to commit anything; please send-pr it so that I don't forget about it when I get back.