make Jay's azure fix an option