Revert 617908c..9e6cb07

This rolls back to commit 617908c6c4e711d449686fa0ae404a22b33f2020.
30-12-2014 10:34