This reverts commit 7c04673.
This reverts commit 0e3581a.
This reverts commit 681e0b7.

Signed-off-by: Oliver McFadden <omcfadde@gmail.com>