Revert "McGerrit"

This reverts commit 8f3db94ff618044da246bf1f69b0ebdb65cfdf32.