Revert "Issue CS-5825 Part Resolution"

This reverts commit 9e72d89ac1fb608656379a70b89ae858721e9233 which was breaking the build.