Revert inappropriate portions of last change.