Revert b5d7eca..9fa528f

This rolls back to commit b5d7eca20ebca62ae2dcd4cc16fcdc9cc8c3e03e.
17-11-2014 15:30