Temporarily patch around lp:1090592