This drop addresses rdar://problem/4213177