Revert "Partial commit"

This reverts commit 64b468d83f9544dbda639649c75f0794b63ca1b3.