Reverted e69e431 as I did not like the way that was working out.