Revert "Part 2"

This reverts commit 658dbdf483eb84226a241e06ddbe1b7118a49f4f.