Breaks bots. Also it's missing changes we discussed on review. This reverts commit f001e50f. This reverts commit 29241892.