Revert "Diff reduce with upstream"

This is still needed to avoid the ATF library / MK_TEST == no chicken
and egg problem.

This reverts commit e9ec07a7de0b86264eb0ac84da93f0f8eec33f7b.