Revert PR #6419
Revert PR #6419

This reverts commit e21a507c3b5865b587b4032f2133a66433553eab, reversing
changes made to 7b4344dd61e25cefab7018bf7c10e807c5329413.

We've tested this in integration and confirmed that it's working as
expected so we no longer need this enabled in this environment.

alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet