Since you're not using this in the rest of the patch, maybe put this back for now and let's plan a more generic version later?