This is a followup after https://trac.webkit.org/r188296. rdar://problem/22206433
Created attachment 258837 [details] Patch
Committed revision 188349