Please add these comments back in after I merge this change.