The latest commit avoids using this.