This reverts commit 736c06e8d8efa79d3d2bc512f13a51f0f63412e2
as this change breaks future versions of bitbake.
See the OE mailing list, in the "Bitbake runqueue performance improvement"
thread for a discussion on why this isn't the best way to solve
multi-image problem and that other better solutions exist.