This partially reverts commit c3d00264.

The smartd changes are not ready to land yet and were included in the
above commit by accident.