This function should be removed from this PR as well.