Revert 69cf711..565338f

This rolls back to commit 69cf7119bba89e2822b9090112df1e40e927371e.
Revert "Dirc"

This reverts commit 7055d161d2e3db58e685f1d6b688ce04abd4273c.