Revert "30-10-2014 - Peter Mademann"

This reverts commit d624eee82ae7e183d287d36743be13d56df49e9b.