Revert "shaggs"

This reverts commit 0ebbcd0a5ab500439682f8dea0dea3814e10add6.