CLOP-timize hanging pieces (3671101)
Revert "CLOP-timize hanging pieces (3671101)"

This reverts commit 31f55942f1f5923f9b09da37f577e5fcfcf28bc2.