is this still in scope for this patch?