This can probably go away, since it's no longer needed.