Additional tweak to 83e4e4e commit, avoid dispatching to call autoload files twice.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'