Revert "Fix stuff... again."