Remove workaround for issue 12164.
Merge pull request #2394 from Kapps/remove12164wa

Remove workaround for issue 12164.