Revert: ARCH: makefile adjustments