It looks like this function is a no-op now, perhaps it can be removed?