revert to common.mk