Note: Don't think we need to make this change in this commit (other than maybe a "TODO")