This should kill all of Pat's bad code and revert to where Riley left it.