RefactorSheep

#295051

atware