Revert "Address change"

This reverts commit d870400c1339f90813bcd8db8b023c154eb9afc8.