r13082: revert an accidentally commited patch (still in progress)