Compilation fix for non precompiled-header builds
Revert workspace change