Update patches to continue to apply, after changes in a9316666a8b37d90202003b4b2523db7ec4daabe