This reverts commit 4069cccf. This causes bot failures, and there's a possibly a better way to get this and other patterns.
