Revert "DEFCONFIG: trimming more debugging"

This reverts commit 61caa82e1d82a6595f1592317189676e27950f9c.
BLOCK: Import deadline iosched from mako stock 3.4