revert TPG 32-bit storage