Revert aafe010..2f7cdb3

This rolls back to commit aafe01023e4d8bb7f72a1a4102d3206783af19ea.
14-11-2014 16:16