Remove custom stacks again again

Auditors: eater, cbhl