Revert "More playing around.."

This reverts commit d74afa307f4a339600409e3fe29e58d48a260e53.