Revert "roll"

This reverts commit 7514498022fc25d552a2a07d6352a93cbf116219.