This reverts commit 55ed09d32e2602eba1dbb8aba1985246739c3909 as it was not responsible for breaking the bots. Sorry.