Created by: iansu
This is (another) temporary fix to get our test suites passing so we can finish work on the 3.0 release. We still need to find and fix the root cause of this issue: #6679 (closed). This workaround should be removed once that's fixed.