Move some patches back, before their related bugs got fixed.