Revert "Partial commit"

This reverts commit abc09b7b890554910b9cb4cd106edce469975d24.