These won't be needed post-merge as this function no longer exists.