Revert "Issue CS-5825 Part Resolution"

This reverts commit 9a615ee7b26547f0c439faf04e5fbf91dc2cbeb1 which was breaking the build.