This reverts commit c8f4552cb7.

Change-Id: I676f8529ed4f9a245893389e9ac35d58c92a53e5
Reviewed-on: http://gerrit.dmdirc.com/917
Automatic-Compile: Chris Smith <chris@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

Issue 3703

Change-Id: I5b58a915dee69bb88abc63771114562d96d4e5b5
Reviewed-on: http://gerrit.dmdirc.com/916
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

Change-Id: I9d1d1f0f85661b8f419b79c0eaedb73c3960036e
Reviewed-on: http://gerrit.dmdirc.com/785
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

Change-Id: I3b95893a0e93f166c4888e3344405cd5b89692d3
Reviewed-on: http://gerrit.dmdirc.com/727
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>