Backout bd14ac695a9e from bug 976735, funnelcake30+31 no longer needed