As I mentioned before, remove these prototype functions since we would remove them soon anyway.  See #1082