Revert "Dumb extras"

This reverts commit aca5201a3935f6adb53b8234ce0bc1b2b2078fb6.