revert r1.68. This breaks 'make install' without doing 'make' first, but