#2132 PR has been reverted on #2303 as it added too much flakiness to e2e tests. Related to #2256 and #2257