Revert a941236..92170c0

This rolls back to commit a9412369c95601d4d5d89a6131c9beefb247fcca.
21-11-2014 17:32
24-11-2014 10:34