Revert changes from r860 for makefiles that are only used