Revert e35a038..91e70a7

This rolls back to commit e35a03871081ba389df5625a08a521ebc906dfc8.
26-11-2014 12:04 good version