Revert e04fbb8..9935557

This rolls back to commit e04fbb8650f9a64df97ff4d0c5add67c7f4ee128.
27-11-2014 11:31