Revert e4ab864..bee4ae5

This rolls back to commit e4ab864653a9055df5cbcdcffc9f9d0595518a41.
16-10-2014 18:00