This tracks the work required. rdar://problem/19213337
Created attachment 251990 [details] Patch
Created attachment 252008 [details] Patch2 With additional fixes.
Committed revision 183592.