Reverting to original slur -- 50 derp points awarded
Merge branch 'grid-by-service'