Work towards <rdar://problem/30313681>
Created attachment 302152 [details] Patch
Created attachment 302215 [details] EWS trial run
Created attachment 302282 [details] Patch
Created attachment 302288 [details] Combined patch w/ 168600
Created attachment 302291 [details] Fix bad rebase conflict
Fixed in r212974