Revert 2900a26..a7008f1

This rolls back to commit 2900a26350299657181269d4244401049dad69fc.
18-11-2014 09:35