Given how late we are in the 2.6.29 process we should probably revert 95f8e302c04c0b0c6de35ab399a5551605eeb006 and d2859751cd0bf586941ffa7308635a293f943c17 and try again for 2.6.30.