Issue #1103910 by mikeytown2, catch: bootstrap_invoke_all() queries bootstrap modules twice