Change that wasn't asked for, interrupted me in reviewing a massive patchset. This reverts commit c271ed14.