Attempting to unbreak the makefile-base builds.