This could end up being a problem.. it doesn't block merging this patch though.