Revert accidentally merging in scythetwirler's changes.