Revert dc99ff8..5131bd5

This rolls back to commit dc99ff8a0fe1e96abc8c8b1e168519955daa5811.
15-10-2014 14:16