Revert "Shaw"

This reverts commit e7495af245d1f6bfa0e0ed31bcec16e4248f6cb6.