Revert "Base commit"

This reverts commit 26b55f47071f661b584d66fe3c797afb32d83699.