This reverts commit abc040e9533011a62a25c93b07b4fc31c8a641f7 as the bots are failing because of this.