Created by: 4ndygu
regardless, i patched the function signature. I'm blind wrt testing though, so @MegaphoneJon could you take a look at this branch real quick?