This reapplies b0979b8c65d, which was reverted in 370aecb9572 due to bot failures. The failures were caused by typos in the testcase that are fixed in this patch.
This reapplies b0979b8c65d, which was reverted in 370aecb9572 due to bot failures. The failures were caused by typos in the testcase that are fixed in this patch.