remove obsolete workaround

Signed-off-by: Blake Geno <blakegeno@gmail.com>
Merge pull request #9439 from blakery/master

Cleanup: remove obsolete workaround