Moved back to original autotool sources.