Restored old build system and removed superfluous doc change.