Why do we need these?  They seem unrelated to this change?