Crypsis: Revert part 2