This reverts commit 4157db4d292b251b9c6cdf34bf52b1772f70c2a4. New formatting did not work out as anticipated.
clean