This reverts commit 9d2c2ed37b530bbbe0980847621b7feacf2e26c0. Signed-off-by: Nathan Booth <nath.booth@gmail.com>