Dealing with this elsewhere.