Revert a60fe73..0ba81fb

This rolls back to commit a60fe7303b313b82859ca03da0753081e7b1b7da.
Removed debug_kit