Revert "Mucking about 2"

This reverts commit b69292b24502df0cd3222bac6008eef09edf58cd.