Revert "another integration issue x'd for now"

This reverts commit 8ed4a7d7bd999699fc598d224f6ccd3ac4f78485.
Revert "another integration issue x'd for now"

This reverts commit 4e1be9a30ea57d075caf93d43d87892d293ffe85.
Revert "another integration issue x'd for now"

This reverts commit b7911746a6966370a4c805e1036f1c9fafcdae8b.
Revert "mark failing test as pending"

This reverts commit 4297d67fa74e5b08f04059dc896b783fd6e9dc5b.