Reverting Address Data Store for code review