This reverts commit 221b0117fd. Some build failures requiring TargetParser and some warnings to clean up.
221b0117fd