Revert _other_ classes to a sane state

Go figure.

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>