Adjust for incremental build.
CurrentDirectory workaround no longer needed as of 131211?