Revert r34533 (except the nice indentation in the Makefile) for unbreaking trunk.