Workaround until looped-around-to-deferred-detection actually works.