Reverted r32225. r29732 already fixes the automake issue in the trunk