This patch itself looks fine, but I think with how the next patch goes we don't even need it anymore, do we?
