Note for Todd: see why this was done.