parts 1 and 2
Revert "parts 1 and 2"

This reverts commit dcc054bbac42ebd422335f4270a3870ce57255dd.