Revert "Revert "piecewise commit 1""

This reverts commit b01a34b20601af62315533848effe312731965ae.