b3cc9f2887
This reverts commit 8e5e1e7bf000f2603a085c76be118214d22c55b4. The following patches will fix this code and may be backported.