Oops: r9004 should have removed various pieces from the Makefile and