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