Log Message:
Fix build breakage many people were seeing (interestingly, I couldn't
reproduce it). Patch from drochner@, tested by tron@.