RIP $gutter
Merge pull request #4909 from guardian/remove-gutter-fixes-4864

RIP $gutter