elasticsearch/elasticsearch#5724 will restore the removed context variables