Revert "Fix for ADT 22"

This reverts commit 06488d3893a731116c643e581958031ae0db80f4.