Remove custom layout hint code and switch
Merge pull request #4614 from guardian/remove-layout-hints

Remove custom layout hint code and switch