Patch to reverse commit fd61179b6483f1c6360968d0f9f7695ea6f380a7

The revert conflicts, so manual mode.