Merged in #f858bc1d4b.