Revert the ION HEAPS and make it dynamic as it was