Squashed Revert of ION changes