[no-merge] Revert workarounds for possible SDK issue

[vitek-karas]

Using this to try to get the tests to fail again - locally it magically works even without the workarounds.