Revert "roll"

This reverts commit a54e53212caae2b4500282f69416d60d9537d51e.