Looks like this is no longer needed, right?