Reverting more Makefiles.