Revert "Fix stuff... again."

Accidental commit.

This reverts commit r219693.