Deeper into the rabbit hole

Reverts incoming