Revert "Revert "Revert "30-10-2014 - Peter Mademann"""

This reverts commit 852a936635efa9a5b0280ab2131a8cda380bcc8f.