Revert commit that breaks bootstrap/aclocal (v2.60, latest release).

That has been annoying quite a bunch of users[1] including buildbots
and myself.

[1] http://forum.videolan.org/viewtopic.php?t=21059