Revert "DIV cleanup"

This reverts commit 3f3fca99448d440f1ce01bcce082b84ad5b3b896.