This should probably go away, since it's not needed anymore.