Added a workaround for #9362. Still doesn't compile because of #9363.
Added a workaround for #9362. Still doesn't compile because of #9363.

[SVN r86615]

nihildeb/hme,nihildeb/hme,nihildeb/hme,nihildeb/hme,nihildeb/hme,nihildeb/hme