Revert "Updated the manager to use only one type of each driver per run, as they are inserted in -1 order the most recent one will be on top"

This reverts commit 46d42fdbc7ec63296d2255c94ae480e64009edb6.