Revert "piecewise commit 1"

This reverts commit b4c9f0150967428377ae11278cec77c44a691c28.