Revert "Change massless parts processing behavior"

This reverts commit 3be6801bebac64ec9edda5ecc1de0533d2075ed1.
Revert "Change massless parts processing behavior"

This reverts commit 451872320f97f637494d460387693cb0ace85997.
Revert "Change massless parts processing behavior"

This reverts commit a7f8acadf71a0401e582f71245b07a9c2ce1b51a.