Revert 33cca73..67e940e

This rolls back to commit 33cca736a1274ffded94195f8aabc7d652b70b60.
19-11-2014 11:39