Pushed to master since 2 weeks have passed and am confident that the
patch works.