revert v0.98 build target dependency changes