Check if this is still necessary.