Fixing the build.
Revert the trifecta change.
Merge pull request #1004 from gabemc/issue/1003

Fixing the build.