Appears to have been broken by #342
Appears to have been broken by #342