This change was a bit more than we bargained for and caused critical tasks to have to re-roll. Rolling back for now so we can discuss it more. This reverts commit 541f24c2.