Revert "127 etc fixes for 59 and new ADT set"

This reverts commit 507b61370b721369a8587d1c11dc570e00aaada7.