Tactical nuke, 1395

Al Munningsrequested to merge
issue/graphql_compose-3450843:3450843-remove-workarounds-for into 2.2.x

Closes #3450843

Merge request reports