Damn. It seems like we should file a bug anyway, and just leave this declaration here. That way even though we have to make this change, hopefully others won't.