Corresponds to 86af43bc82 in master