Revert "backport the patch to fix intermittent failures inside build farms"

This reverts commit 95b37f80b732cd65c5ec0a63391e02f5cc1c541b.
use correct release in changelog