(This is actually the second time the encoder stuff is removed;
the first was in 8b411918.)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>