Fix ordering bug caused by overzealous refactoring
Fix ordering bug caused by overzealous refactoring

shamrin/Eve,witheve/Eve,shamrin/Eve,shamrin/Eve,nmsmith/Eve,witheve/lueve,witheve/lueve,witheve/Eve,witheve/Eve,nmsmith/Eve,nmsmith/Eve