Remove hack that forwards to populated context.