Revert "Making diversion work"

This reverts commit 75303c9b01c024e21192ad648ff3a6f921d2f17d.