Revert "roll"

This reverts commit 65acc1c638ae0c21929aa1b3d9f7b3d212be2dce.