Revert "New New Diapo"

This reverts commit 2565ea6194ffbb7f56be2739592ac2b115ff4769.