This reverts commit 1a4022a4.

1a4022a4 was not taking mac-dvd into account and adding an extra step
there. But I can't see the bug this commit was supposed to fix in the
first place so I'm reverting it.