The shell and the part need to be independent of each other.
This reverts commit 931425987ab9138bd843e02488dfaa6fa1afd52f.