Roll out this fix.
<rdar://problem/37595065>
Created attachment 338608 [details] patch
*** This bug has been marked as a duplicate of bug 182859 ***