Revert "Adaptor refactoring in progress"

This reverts commit ca6d0404ee451622472ad9f32b02fb8624989c0d.