Revert "Cleanup"

This reverts commit 03777183dca8e1579c67e0c5a027e2f850ccdd2e.
Revert "KitKat Blobs"

This reverts commit 4e7c1134350684c3c9cd5cb645431c55e46617f0.