Revert "Initial commit derived from 3a"

This reverts commit 23a37398bc94e833dd80f3f4eb56eb38695f2bb3.