Revert "Merge pull request #373 from alistairmcmillan/FixHotSportPortalIssue"

This reverts commit e03899c0c614557a687e70f375d3d47c995c21bc, reversing
changes made to 091d149bab1c158890312977eaa0b3524a36f5c8.
Better fix of #300