Reverted immutable to type since not everyone has 2.0. TODO: This should be reverted.