Did you really want to touch this class? As you know, this has been troublesome code and it seems like it works on master, so I'd like to know you're doing this work with a purpose.