temporarily revert fix for …
Merge branch 'release/27.0.2'