No, this is actually fulfilling the TODO. I'll remove it.